Ilkka Seppala 072a885ec8 Merge branch 'master' into layers ...

Conflicts:
	layers/src/main/java/com/iluwatar/layers/App.java
	layers/src/main/java/com/iluwatar/layers/Cake.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingException.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
	layers/src/main/java/com/iluwatar/layers/CakeDao.java
	layers/src/main/java/com/iluwatar/layers/CakeInfo.java
	layers/src/main/java/com/iluwatar/layers/CakeLayer.java
	layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java
	layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
	layers/src/main/java/com/iluwatar/layers/CakeTopping.java
	layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java
	layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
	layers/src/main/resources/applicationContext.xml

2015-08-15 20:47:34 +03:00

..

etc

#84 Added class diagram

2015-08-15 20:30:54 +03:00

src/main

Merge branch 'master' into layers

2015-08-15 20:47:34 +03:00