added markup files, fixed config
Merge branch 'master' of https://github.com/bigspring/aegis

Conflicts:
	assets/css/index.html