stuff
Merge branch 'master' of https://github.com/PharaohAsh/pharaohash.github.io

Conflicts:
	resume.html
Updates to resume page + other tweaks