master' of https://github.com/anztrax/simple-image-server-frontend
master' of https://github.com/anztrax/simple-image-server-frontend

# Conflicts:
#	.gitignore
#	README.md

anztrax/simple-image-server-frontend