open1
hf
Merge branch 'snippet'

Conflicts:
	codesnippetapp/src/codesnippetapp/views/SnippetListView.java