lots of thing
Merge branch 'master' of github.com:Leterren/senior_project