new
Merge branch 'master' of https://github.com/Arkanine/Tested

Conflicts:
	app/views/tests/_edit_form.html.erb