first commit
Merge https://github.com/fclay/Gleason-Senior-Project