finally...
Merge branch 'gh-pages' of https://github.com/trantorLiu/ArmyApp into gh-pages

Conflicts:
	stylesheets/style.css