Merge branch 'Tyler'
Remove content from previous merge conflict
Merge branch 'Tyler'
Merge branch 'master' of https://github.com/IndianaTech/WarriorHack