Added intro and Outro
Merge branch 'gh-pages' of https://github.com/PHIConflictAssignment/Conflict into gh-pages

Conflicts:
	css/app.css