No valle!
Newline FTW
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/Build.scala