some small changes
Merge branch 'welcome_page' of github.com:twuster/rails-final-project into welcome_page