First Commit
Edited Media Queries
Merge branch 'master' of https://github.com/neundex/base

Conflicts:
	css/main.css
	index.html