remove old files
Merge branch 'development' of https://github.com/joeonmars/fengshui-prototype into grunt

Conflicts:
	.DS_Store
use grunt template;