Initial commit
Merge branch 'master' of https://github.com/Overload119/amirsharif.com
Fixing some things for the new site
Merge branch 'gh-pages'
Merge branch 'gh-pages'

Conflicts:
	.gitignore
	about.html
	index.html
Commit things before I merge to GH
Minor style changes and conflict fixes