fixed new lines
Merge branch 'feature'
fixing stuff
Moving stuff around