Fixed a few bugs
Merge branch 'master' of https://github.com/wetherbeei/SD2013-UIUC