featured item
Merge branch 'master' of https://github.com/GoldenEggRoom/goldeneggroom.github.io

Conflicts:
	parse-angular-demo/client/app/scripts/controllers/ideas.js
featured idea
Merge branch 'master' of https://github.com/GoldenEggRoom/goldeneggroom.github.io