video
Merge branch 'master' of https://github.com/wyliethomas/teraflex

Conflicts:
	app/controllers/welcome_controller.rb
	config/routes.rb