no message
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/App_Data/Database1.mdf
	Homework/Homework/App_Data/Database1_log.ldf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918.mdf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918_log.ldf
no message
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/App_Data/Database1.mdf
	Homework/Homework/App_Data/Database1_log.ldf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918.mdf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918_log.ldf
Design si diverse chestii
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/App_Data/Database1.mdf
	Homework/Homework/App_Data/Database1_log.ldf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918.mdf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918_log.ldf
Design si diverse chestii