Merge pull request #40 from lapty/master

angular-animations are dope
added servings
Merge pull request #42 from lapty/master

fixed transitions a bit more
changed serving sizes.. still needs some work
Merge pull request #43 from lizkline91/master

changed serving sizes.. still needs some work
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
hotfix container