potali-5-1 remove generated test
Merge branch 'potali-5-1' of github.com:mdk199/rorproject into potali-5-1

Conflicts:
	app/views/shared/_tags.html.erb