CSS mockup with map
merge conflicts
added validations to user input form
added status test
merge fixes
fixed stuff we accidentally deleted
merge conflicts
Merge pull request #20 from bobolinks-2014/validations

Validations