updating finally
Catching up to newest version
Merge branch 'dev'

Conflicts:
	.DS_Store
	index.html
	movember.html
	movemberparty/index.html