commit
image upload
Merge branch 'master' of https://github.com/frostm/frostm.github.io

Conflicts:
	projects/thesis.html