Updateting
Updateting
Updating
Updating
Finish Watch!
Merge branch 'Martin' into Daniel

Conflicts:
	src/com/danmar/watch/controller/WatchController.java
	src/com/danmar/watch/model/WatchModel.java