didi's first commit
dididididid's first commit
I hope this works
Merge branch 'master' of github.com:searchandrescuealerts/sara

Conflicts:
	views/index.jade
Didi's really awesome first commit that took two hours