Adjusted card template
fixing merge conflict
Putting linked in seed in seed file
Merge branch 'master' into map_form
Making branch up-to-date
Updated branch and got forms styled
Merge pull request #67 from red-admirals-2014/map_form

Map form- newest up on heroku