Finished with my end

My end is done!!
Merge branch 'master' of https://github.com/riggtravis/rom-30_and_J