major changes
Merge branch 'master' of https://github.com/fclay/Gleason-Senior-Project