a
Merge branch 'master' of https://github.com/sastrian/einfach_machen

Conflicts:
	app/views/pages/contact.html.erb
sd
updated sqllite gem bundle