Changed some code for consistency
Modified some code for consistency
Merge branch 'dev' of github.com:jslinker/CS340 into dev