Merge branch 'design' of https://github.com/klepas/makehackvoid.com
Adds missing mixins etc. from BS3, homepage grid, whitespace cleanup.
update members datafile
fix link to blog
Merge https://github.com/klepas/makehackvoid.com

Conflicts:
	_data/members.yml
	_layouts/base.html
remove dropdown menu in main nav
add &nbsp; to map iframe
added vim swp files to gitignore
change to makerspace

change subtitle to makerspace & remove spaces from MakeHackVoid
Update _config.yml
Merge branch 'master' of http://github.com/makehackvoid/makehackvoid.com

Conflicts:
	_config.yml
	index.md
Merge https://github.com/brendam/makehackvoid.com
Merge pull request #57 from devdsp/master

Bring the master branch up to date with everyone's changes, ’cause it worked on one dev instance yo.