Revert "intergrated into one git"

This reverts commit 276d1ec17736b748338fae3d118d44561bf69350.

Conflicts:
	js/app.js
	js/controllers.js
	js/services.js