commented out dropdown
changed model habtm
re-submitt nav bar
Merge branch 'master' into paul
merge conflict