Added everything we have atm
Merge branch 'master' of https://github.com/HippoWorkz/Project7-8