Getting the Foundation Down
Merge branch 'master' of https://github.com/friendwell39/new-design

Conflicts:
	css/styles.css
	index.html