Committing before tonight's meeting.
Another commit (missed some stuff in previous commit).
Merge branch 'master' of github.com:sql-sith/cdc2015

Conflicts:
	battleship_optional.py
Add cat.txt
Updatebattleship_optional.py
Add .gitignore to ignore eclipse / pydev project files.
Removed cat.txt
Merge branch 'cat'