tralallaa
dupa
Merge branch 'master' into second

Conflicts:
	app/views/test/index.html.erb