adds
add
ads
Merge remote-tracking branch 'origin/master'

Conflicts:
	EF/EF.csproj
	EF/Migrations/201411300812103_update.Designer.cs
	EF/Migrations/201411300812103_update.resx
Merge remote-tracking branch 'origin/master'
adds
Merge remote-tracking branch 'origin/master'

Conflicts:
	EF/EF.csproj
	EF/Migrations/201412020336183_Update.Designer.cs
adds
Merge remote-tracking branch 'Budget/GMY'

Conflicts:
	Budget/Budget.csproj
	Budget/Controllers/ProfitLossController.cs
	EF/EF.csproj
first commit
first commit
first commit
first commit