initial commit
first functional version
resolving conflict on gitignore