Update From Macbook
Merge branch 'master' of https://github.com/picnii/taicome

Conflicts:
	data/action.json
	data/animal.json
	data/celeb.json
	data/place.json
	data/stuff.json
	js/Controller.js
	js/init.js
	template/home.html
	template/profile.html
	template/share-view.html
	template/share.html