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