From: Kevin Zhang <icestormf1@gmail.com>
Date: Wed, 17 Feb 2016 19:11:52 +0000 (-0800)
Subject: Merge branch 'cindy/secondHood'
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=786a78c72aa11ff2c03ca170aaf24f5999a3feee

Merge branch 'cindy/secondHood'
---

786a78c72aa11ff2c03ca170aaf24f5999a3feee