Merge branch 'master' into Tyler
Merge branch 'Rob'
Added content for Sponsor page
Merge branch 'Tyler'
Merge pull request #8 from IndianaTech/Tyler

Tyler
Merge branch 'Tyler'

Conflicts:
	index.html
	styles/warriorhack-styles.css
Merge branch 'master' of https://github.com/IndianaTech/WarriorHack
Merge remote-tracking branch 'origin/Rob'
Attempting to merge again...
Merge branch 'master' into Rob