Resolve merge conflict
Multiple columns for amenities list
Add spacing between checkbox and input label
Add rails info to readme
Fix readme
Newline to make the whitespace gods happy
Merge pull request #11 from codeforamerica/search-styling

Search styling
Merge master