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

Conflicts:
	public/js/app.min.js
deleted app.min.js
Merge branch 'ray'
removed welcome.min.js
'merge'
'merge'
Merge branch 'master' of https://github.com/RayKwon/gistcamp
Merge branch 'ray'
removed copied file
Merge branch 'ray'
Merge branch 'ray'
merge
add oAuth
merge
adjust offset for arrowing down