Controller
Merge branch 'master' of https://github.com/fiery-skippers-2014/Kitter into Nathan_Andrew

Conflicts:
	source/cats/app/controllers/sessions.rb
Release -11
fixed merge conflict
Merge pull request #8 from fiery-skippers-2014/Nathan_Andrew

Nathan andrew