rendering map, placing marker
pre merge commit pt 2
Merge branch 'master' into new_map3
merge commit, marker with info window
began refactoring
Map hidden, but rendered in single page
rendering map correctly
more MVC
fixed some magic numbers
eliminated magic numbers
Merge pull request #30 from red-admirals-2014/magic_numbers

Magic numbers
fixed markers are showing up
Generated map/placed multiple pins/refactored
Able to get all data from the form including alum id
Merge pull request #32 from red-admirals-2014/multi_marker

Multi marker
merge conflicts fixed
everything working after merge with master