Master
Master
Merge branch 'master' of github.com:caspertradeshift/plaground

Conflicts:
	stuff.scala
Master
updated
new update