Merge branch 'Tyler'

Conflicts:
	index.html
	styles/warriorhack-styles.css