Should be working. Has a few things I'd like to fix yet, some extra
forms for later use, etc...
Merge branch 'master' of https://github.com/gritterm/SeniorProject.git