big update
Merge branch 'master' of github.com:akunkel94/finalproject