Added title field to card template
Merge branch 'master' into small_map_update
Added title field to card template and added up to date map with bug fixed.
fixing merge conflicts
fixed card bug
Merge pull request #56 from red-admirals-2014/small_map_update

Small map update- fixed card bug