pre merge wip - work on models
Merge branch 'master' of github.com:PureHacks/CircuitFactory

Conflicts:
	circuit/www/js/models/models.js
gitignore added and os files removed