Cleared cache folder
Cleared cache directory
Merge branch 'master' of https://github.com/garthee/gnot

Conflicts:
	.gitignore