Merge pull request #13 from amy-mac/master

Stuff
moar testing for user model
rspec for accident model
added facebook popup window
Merge pull request #14 from fo95116/master

popup window for facebook login is working and some model rspec testing
Added link to underscore file before the other js files
Added template with more info for marker popup
can now delete markers from database