Added some important info.
Merge branch 'master' of https://github.com/atalbot/2014-04-GARNET-MaxNewbert

Conflicts:
	journal.txt