intro/home

extension
Merge remote-tracking branch 'origin/master'

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

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