merge
Merge branch 'master' of https://github.com/2015HackNTU/Official-Website

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/2015HackNTU/Official-Website
add node modules & add them in package.json