git push origin master
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	parser.rb
checkAnswer
next round
Merge branch 'dev'
real snippets