Decided to take one last look at my project before its due...GLADOS broke it and almost gave me a heart attack but with some minor changes it is up and running again hopefully.
Forgot to take out some annoying alerts for testing purposes
Merge pull request #2 from kelseyobrien/master

Master