new.html.erb
Merge branch 'master' of github.com:colleenjoyce/twitterick