Modified project file to work offline
Grouping model / stylistic changes to base model
Merge branch 'master' of github.com:macourtney/masques

Conflicts:
	project.clj
Added page field to profile table.
Merge branch 'ted'