new line again
Merge branch 'master' of https://github.com/hlong92/Demo

Conflicts:
	a