Merge branch 'Tyler'
Merge branch 'Tyler'

Conflicts:
	index.html
	styles/warriorhack-styles.css
Merge branch 'master' of https://github.com/IndianaTech/WarriorHack