modularized code
Merge branch 'master' of github.com:DannyMardini/wishlist