first version
Initial commit
Delete .gitignore
Merge branch 'master' of https://github.com/amervyn/Defibs

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/amervyn/Defibs

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/amervyn/Defibs