added a .gitignore file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Removed .idea files from project (these should never have been tracked in the first place).
Fixed gitignore to properly ignore files in the .idea directory
Added some initial docs on Python as well