commit localllycious
merged
Merge branch 'master' of github.com:freuk/testing

Conflicts:
	file.tru