pulling everything again

deleting everything to pull again...
Merge branch 'Andrea's-Branch' of https://github.com/bruno-azenha/adventure-squirrel

Conflicts:
	Story.py
	adventure_squirrel_writer.py
	useful.py
Merge branch 'master' of https://github.com/bruno-azenha/adventure-squirrel

Conflicts:
	Story.py