adding laptop changes
cleaning merge, added .classpath to ignore