added Day #14
Merge branch 'master' of https://github.com/codejoe/AkademiRails