增加瀑布流
rm node_modules
修改数据库配置
small problem
add masonry
Merge remote-tracking branch 'ricardo/master' into youngbye

Conflicts:
	views/content.html
添加了masonry和imagesLoaded，修复了瀑布流bugs
update
Merge branch 'master' of https://github.com/kidbai/haixiu_page

Conflicts:
	public/css/main.css
	views/content.html
	views/footer.html