Re-commit files
Merge branch 'master' of https://github.com/amphibian/gigpress

Conflicts:
	.gitignore