Java
Merge branch 'master' of https://github.com/Adrian2014/phase_0_unit_1

Conflicts:
	week_3/2_js_variables_objects/my_solution.js