delete information
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop

Conflicts:
	information
bug fix