fixed margin bug
Merge branch 'master' of github.com:noidontdig/nyu-cs-prototype