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
All of the old #current table style deleted, replaced with two lines of css
Finally got text to work, although it is still boxy
Last commit with links properly defined, still want to try to get them to center vertically
Finally solved vertical centering problem (with a nonsensical solution), also fixed footer and extra div closing