isotope11/client_app — pull request #3 by dchapman1988 (2013-02-19 20:14:35+00:00)
Title: Merge and fix conflicts

Merges [#2](https://github.com/isotope11/client_app/pull/2) and resolves conflicts.