updated stuff
Merge branch 'master' of https://github.com/pfitch45/Hackday_Project-