move back to sqlite3
database.yml
added h3 css, filled about page and changed footer
facebook and twitter logo added in the footer
changed text, added logo with link to our blog
inserted google maps and contact person information
added user fields, added form fields, changed user page
Merge branch 'mauries'

Conflicts:
	Gemfile
Merge branch 'paperclip_image_upload'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:Zwooosh/MT-Identity

Conflicts:
	Gemfile
	app/models/user.rb
	app/views/users/_form.html.haml
	app/views/users/show.html.haml
	db/schema.rb
remove vendor
reinstall gems
setup load paths for rvm
display errors on production
fix scss deploy error
change css for deploy test
turbo sprockets for faster assets
gemfile.lock mismatch
move to sql2 for production
gemfile.lock mismatch