SDSD
Merge branch 'master' of https://github.com/vermouth1026/ec512project

Conflicts:
	App_Data/Database.mdf
	App_Data/Database_log.ldf