- fixed broken method
 update exercise 1, added interfaces
fix merge conflict