m-a-r-v/islandshopping — pull request #4 by snoopy1989 (2012-04-05 18:01:58+00:00)
Title: States Classes added

and a conflict to resolve