fixed a nasty bug-o
Merge branch 'master' of https://github.com/josephmartin09/hackRU