messing with stuff

added newline
Merge remote-tracking branch 'origin/dev' into dev
Some simple changes

MOAR TEST CHANGES