App start
rails cucumber setup
test env set up
working team model before user
basic tasks model working
working type tasks STI
check-in before routes refactor
comments added to tasks
before navigation controller
with a few scope queries
Merge branch 'dev' of https://github.com/elliottm/task_mgr_app into dev
global nav filled out, example charts, before refactor and refine
post navigation testing and refactor methods, rspec cucum clash Factories unresolved
starting to integrate front end
dev branch
ready to work
test
test slide1
Merge branch 'dev' of https://github.com/whittakersc/waza-task into dev

Conflicts:
	app/views/welcome/index.html.erb
grid