Merge branch 'master' of k3:/home/git/repositories/assessment/gcis-py-client

Conflicts: .gitignore

Merge branch 'master' of k3:/home/git/repositories/assessment/gcis-py-client
Conflicts: .gitignore
067c7384 · abuddenberg · 6fe14a22 · 01ea4f39 · 067c7384
Commit 067c7384 authored Mar 26, 2014 by abuddenberg
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 .settings
 *.pyc
 *.pk1
-bin/*
 src/blah.py
 src/Blah.py
 dist/images/*.png