Regular lab finished

Still have extra part to do
Merge branch 'master' of https://github.com/chenhoward/railsdecal-lab1
Finished extra part of lab