changed date of conference 2015 and added venue.
added registration button
Merge branch 'pr/21'

Conflicts:
	index.html
Merge branch 'pr/21'

Conflicts:
	index.html