50% through google maps
Merge branch 'master' of https://github.com/JYoung217/memorium into map
finished map functionality
fixed show
fixed show page
Merge pull request #76 from JYoung217/ui_layout

Ui layout
added descriptors
Merge branch 'master' of https://github.com/JYoung217/memorium into map

Conflicts:
	app/views/layouts/application.html.erb
	app/views/memorials/show.html.erb
fixed layout issues and fixed map
fixed specs
Merge pull request #77 from JYoung217/map

Map
modifying show
basic modification of style