Merge pull request #2 from shawntabai/master

Merge from master
Added practice code page- caninematch1
Merge branch 'master' into coleen

Conflicts:
	map_java/src/com/matchapet/web/WebServletModule.java
Merge pull request #4 from shawntabai/coleen

Coleen
Merge pull request #5 from shawntabai/master

Merge pull request #4 from shawntabai/coleen
Added Lombok and other modules
Merge pull request #6 from shawntabai/shawn

Remove protos completely and replace with Lombok POJOs
Merge pull request #7 from shawntabai/coleen

Coleen
Merge pull request #9 from shawntabai/master

Merge from master