About & Landing Complete
Merge branch 'master' of https://github.com/IrisNerve/iris

Conflicts:
	.DS_Store
	iris/.DS_Store
	iris_app/.DS_Store
	iris_app/templates/.DS_Store
	iris_app/templates/assets/.DS_Store