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

Conflicts:
	Homework/Homework/Models/AccountModels.cs
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/Homework.csproj
	Homework/Homework/Models/AccountModels.cs
	Homework/Homework/Views/Homeworks/Teme.cshtml
star rating
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/App_Data/aspnet-Homework-20140329223918.mdf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918_log.ldf
download fisiere
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
	Homework/Homework/Controllers/HomeworksController.cs
	Homework/Homework/Homework.csproj
	Homework/Homework/Models/AccountModels.cs
no message
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
	Homework/Homework/Controllers/AddHomeworkController.cs
	Homework/Homework/Homework.csproj
	Homework/Homework/Models/AccountModels.cs
descarca surse, teme din liceul meu(prima pagina)
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
	Homework/Homework/Controllers/HomeController.cs
	Homework/Homework/Controllers/HomeworksController.cs
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks

Conflicts:
	Homework/Homework/App_Data/Database1_log.ldf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918.mdf
	Homework/Homework/App_Data/aspnet-Homework-20140329223918_log.ldf
	Homework/Homework/Controllers/HomeworksController.cs
	Homework/Homework/Views/Homeworks/ShowHomework.cshtml
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
	Homework/Homework/Homework.csproj
	Homework/Homework/Models/AccountModels.cs
	Homework/Homework/Views/Home/Index.cshtml
Merge branch 'master' of https://github.com/bogdantmm92/Homeworks