First commit
Merge branch 'master' of https://github.com/wewill147/ConferenceTest

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/wewill147/ConferenceTest

Conflicts:
	.gitignore