ボタンホールド
Merge branch 'master' of heroku.com:irkitjs

Conflicts:
	public/js/_swipe.js
	public/js/min/functions.min.js
	public/js/min/functions.min.js.map
Merge branch 'master' of heroku.com:irkitjs
add newrelic to heroku
Merge branch 'develop'