Fixed merge conflict
Added skeleton for alt
Merge branch 'master' of https://github.com/Iancam/pantry