GreenBagel dev commit 1
Merge branch 'dev'
Merge remote-tracking branch 'github/master'

Conflicts:
	abc.txt