Ignore this commit - fixed one small thing
Merge branch 'master' of https://github.com/ImplodingApps/Snippy

Conflicts:
	Snippy/src/org/implodingapps/snippy/Snippet.java