initial commit
.gitignore refresh
Merge branch 'master' of https://github.com/ShuffleBox/techpages

Conflicts:
	.gitignore