gitignore
git
Merge branch 'master' of https://github.com/farshadtx/Be-Your-Boss

Conflicts:
	Resources/alloy/controllers/mainViewController.js