First Start in Nitrous
Finiish Static Pages
Merge branch 'master' of github.com:hikaiao/sampleapp

Conflicts:
	.gitignore
Push to Github
Merge branch 'master' of github.com:hikaiao/sampleapp

Conflicts:
	.gitignore