scrollspy
merging daveys navbar commit
commiting daveys changes
Merge branch 'master' of https://github.com/ldrohan/March2014Yearbook
adding js.coffee file deletion