Final changes (maybe)
Merge branch 'master' of https://github.com/allspartan/final_project