Changed Shami to full member
Merge branch 'master' of https://github.com/nanograv-pire/nano-web into develop

Conflicts:
	participants.html
Updating
Started Participants list, made layout modifications to index.html
Testing out pictures for participants
Added minified holder.js
A light index page, no pictures
Updated colors in css
Updated to current layout idea
Merge branch 'develop' of https://github.com/nanograv-pire/nano-web into develop

Conflicts:
	index.html
Added headshots
Modified headshots for 64x64, updated participants page
Added more headshots
Added Nate and Adam in Cyber-I section
Changes to index
Merge branch 'master' of https://github.com/ryanslynch/nano-web into develop

Conflicts:
	index.html
	participants.html
Merged Ryan's changes, updated social media links
Updating NavBar
Added back in the documents
Push social bit