We are styling
Merge branch 'proto' into joaquin
updating branch
update to styles
Merge branch 'david' into joaquin
Fix typo in model name
Parse default attributes for business model
Refactor server init to be more concise
Merge branch 'david' into joaquin
add css for map
Merge remote-tracking branch 'origin/joaquin' into adam
grabbing sass files to get a better idea of the map render functionality
quick change to map-view.js to get it rendering on button click
Obtain the coordinates for each interval along a route
Calculate intermediate waypoints if the distance between route intervals is too great
adding styles for functioning map render within template
Code for iteration through collection adding markers working
Merge branch 'brock' of https://github.com/Localhost3000/along-the-way into david
Add geocoding to marker code
Add test collection for continuity purposes
Merge branch 'adam' of https://github.com/Localhost3000/along-the-way into david

Conflicts:
	app/js/routes/map-route.js