changed heading stuff
Merge branch 'master' of https://github.com/rbirdman/Dropbox

Conflicts:
	app/views/calender_items/calendar.html.erb
Merge branch 'master' of https://github.com/rbirdman/Dropbox
Merge branch 'master' of https://github.com/rbirdman/Dropbox