Dialogue code worked on

Half finished work
Merge branch 'master' of https://github.com/raze2012/Game-Jam-2014