example stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	BudgetPro.v12.suo
	BudgetPro/NgApp/app.js
	BudgetPro/bin/BudgetPro.dll
	BudgetPro/bin/BudgetPro.pdb
	BudgetPro/obj/Debug/BudgetPro.dll
	BudgetPro/obj/Debug/BudgetPro.pdb
	BudgetPro/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
cool stuff