minor bugfixes in variables names
Merge branch 'master' of https://github.com/braude-spring-2014/Project
Merge branch 'master' of https://github.com/braude-spring-2014/Project