Working on form for map view
Merge branch 'master' into map_form
Making sure branch has up-to-date master
Merge pull request #60 from red-admirals-2014/map_form

Map form
Design changes to form and form buttons
Merge branch 'master' of https://github.com/red-admirals-2014/BootTrack into sass_design

Conflicts:
	log/development.log
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
map now has info windows
Merge branch 'master' into display_map_cards
Merge pull request #61 from red-admirals-2014/display_map_cards

Display map cards
Designing front page logo
Merge branch 'master' of https://github.com/red-admirals-2014/BootTrack into sass_design
Designing front page
Got map form functionality working. Needs styling
Merge branch 'master' into map_form
Updating branch before pushing
Changed logo and header font
Merge pull request #62 from red-admirals-2014/map_form

Map form
Changed logo design and forms