added stuff
Merge branch 'master' of https://github.com/djlazz3/tsa

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