changes
Merge branch 'master' of https://github.com/adi89/wdi3-rails