First commit
Merge branch 'master' of https://github.com/xenocs/specfe-xenocs

Conflicts:
	.gitignore