bug fixes
Merge branch 'master' of https://github.com/Line-Up-Admin/CSE-403-Spring2014
Merge branch 'master' of https://github.com/Line-Up-Admin/CSE-403-Spring2014