welocme page implemented, updated routes, ready to sleep
fixed git conflicts
Merge pull request #16 from jonnyparris/alex1

Sweeet, gonna capybara this mofo