First commit.
Merge branch 'gh-pages' of https://github.com/bingdow/ArmyApp into gh-pages
version 1, 1/19.
Merge branch 'gh-pages' of https://github.com/trantorLiu/ArmyApp into gh-pages

Conflicts:
	index.html
version 1.1. Merge from trantor.