commiting before merging with vince
Merge remote-tracking branch 'vince/mynewbranch'

Conflicts:
	log/test.log
commiting before merging with vince
merging with vince's new code
Merge remote-tracking branch 'vince/fixing_css'
commiting tidy javascript
commiting tidy javascript
commit before merge from ecomba
commit before pushing to remote
commit before merging with frontend additions
commiting before merge
commiting before merging with ecomba
commiting before new branch
commiting before pull request
Merge pull request #5 from KeirOsborn/master

pull request for latest code, half way through journal entry stuff