Not sure quite what I am doing
Merge branch 'master' of https://github.com/clado/team2264

Conflicts:
	Back WRT.png
	IMG_3186.JPG
	IMG_3187.JPG
	IMG_3189.JPG
	README.md
	calendar.html
	group.JPG
	index.html
	laptopGuy.JPG
	logo.png
	meeting.JPG
	people.JPG
	style.css
changed image styling from block to background, removed tables, will continue with this anti-table task
Last working version of quasi-table layout