change that goddamn picture
basic styles
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/adamjacobbecker/avsan.github.io

Conflicts:
	i/self.jpg