preparing to pull master
marge conflicts resolved
map is showing up
Merge pull request #40 from bchiatt/angular

Angular
Merge pull request #41 from bchiatt/locations

Locations
Merge pull request #42 from bchiatt/locations

map is showing up
register works again