'************************'
Merge branch 'master' of https://github.com/RayKwon/gistcamp

Conflicts:
	public/js/app.min.js
'merge'
'merge'
Merge branch 'master' of https://github.com/RayKwon/gistcamp