Merge branch 'master' of https://github.com/leesunny/BCEEConference-Backend.git

Conflicts:
	index.html
Merge branch 'master' of https://github.com/leesunny/BCEEConference-Backend.git
Added DS_Store to ignore list.