almost done
Merge branch 'master' of github.com:hasmanydevelopers/urlwriter

Conflicts:
	app.rb
	views/index.erb
	views/show.erb
Merge branch 'master' of github.com:hasmanydevelopers/urlwriter

Conflicts:
	views/index.erb
	views/show.erb
WIP