Revert "test"

This reverts commit 32b3230bbf812e2dd38ba8df7baf8e151f5f9dad.
Merge remote-tracking branch 'origin/master

Conflicts:
	tsa/app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/djlazz3/tsa

Conflicts:
	tsa/app/views/layouts/application.html.erb