fixed merged conflicts
some clean up
Merge branch 'master' of https://github.com/jcvno/ToTheTop
Added start images for future use