format commit
Merge branch 'master' of https://github.com/Valiken/Senior-Project-App