first commit
Updates.
Merge branch 'master' of https://github.com/dj10dj100/personalsite

* 'master' of https://github.com/dj10dj100/personalsite:
  Initial Commit.
  first commit

Conflicts:
	css/1140.css
	css/ie.css
	css/styles.css
	index.html
	js/base.js
	js/css3-mediaqueries.js