Added .gitignore
Initial import of old version
fixed conflicts
Merge branch 'master' into github