fixed calendar
another route
Merge branch 'master' of https://github.com/AmilKey/Calendar-emberjs

Conflicts:
	app/initialize.coffee
	app/router.coffee
	app/styles/application.css
	app/templates/calendar.hbs
	app/templates/home.hbs