added ember cli generated files
Merge branch 'master' of https://github.com/JPBetley/forge

Conflicts:
	package.json
deleted dependencies