Initial view
Merge branch 'master' of github.com:correlator/NBShaker

Conflicts:
	config/routes.rb