inital project version
Added .gitignore file for *~ and .pyc
Fixed .gitignore
removed ~ files
Fixed conflicts