the tree almost done
Merge branch 'dev' of https://github.com/lilly1206/bc-hackathon into dev

Conflicts:
	server/app/stylesheets/styles.css