init commit
adding implementation
updating to latest from laptop
updated
Merge branch 'master' of github.com:Jiyuu/SkypeFX

Conflicts:
	.gitignore