Replaced new view and controller with splash
Merge branch 'master' of heroku.com:wchen-url

Conflicts:
	config/routes.rb
Ramping up on testing side of things
P0 bug: shortened urls not redirecting
Allowing custom aliases
Merge branch 'master' of heroku.com:wchen-url