fix for issue 17
Merge branch 'develop' of github.com:PurdueHackers/hackathon into develop