changes

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
Merge branch 'master' of github.com:Dericgf/project1encryption

* 'master' of github.com:Dericgf/project1encryption:
  message