removed clean
added somethingz
Merge branch 'newstuff'
Merge branch 'newerstuff'

added somethingz to see if how it would merge when another branch has changed it before hand