what the...
Merge branch 'master' of https://github.com/dev-club/webpage

Conflicts:
	index.html
stylesheet added