Initial check in
added .idea/.name
added .gitignore
adding .pyc files
resolved conflicts in .gitignore