Finished JS work #3.
Merge branch 'master' of https://github.com/Windymelt/Hatena-Intern-Exercise2014

Conflicts:
	js/main.js