Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes ...

Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade

2013-12-02 18:24:33 -07:00

..

lists.jade

Merge branch 'develop' into classes

2013-12-02 18:24:33 -07:00

task.jade

Merge branch 'develop' into classes

2013-12-02 18:24:33 -07:00