in progress
Merge branch 'cost-feature' of https://github.com/Fathalian/nestor into cost-feature
login to AWS and load your current infrastructure
Merge branch 'cost-feature' of https://github.com/Fathalian/nestor into cost-feature

Conflicts:
	app/scripts/controllers/codeGen.js
	app/scripts/controllers/main.js