fensite-8 Adding info to feng shui element sections
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/partials/home.html
	app/partials/home.jade
Merge remote-tracking branch 'origin/master'
fensite-8 Adding info to feng shui element sections
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/partials/home.html
	app/partials/home.jade
fensite-8 Adding info to feng shui element sections