Basic associations working
All models and associations ready
Views, models, assoc. ready
Merge branch 'master' of github.com:Xypus/Lab

Conflicts:
	app/views/mice/index.html.erb