get example map
first commit
add bootstrap files
remove unnecessary files
Merge branch 'twitter-bootstrap' into develop

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
modal box and form built, to be improved look wise
ignore ds store files
Added logo, it's a start
Merge branch 'develop' of github.com:rubenkostucki/nomnivor into develop
new favicon
removed ds store
call to action button
Changed to google font
merge develop
renamed file to logo
restaurant model
restaurant model again
add logo
delete file
Merge branch 'twitter-bootstrap' into develop

Conflicts:
	app/views/map/show.html.erb