Merge branch 'master' of https://github.com/Bobobobobo/happinning

Conflicts:
	routes/getPins.js
merge fix
fix conflict