Merge branch 'kevin'
oops
Merge branch 'kevin'

Conflicts:
	config/application.rb
Merge branch 'kevin'
Merge branch 'kevin'
Merge pull request #1 from ksolkowski/kevin

Kevin
description stuff
some more stuff
Merge branch 'master' of https://github.com/ksolkowski/calendary
Merge branch 'master' into kevin