updated script order
Merge branch 'master' of github.com:vcnickerson/SkyNetHackathon

Conflicts:
	app/views/index.scala.html