first commit
already solved conflict
Merge branch 'master' of http://github.com/jackguo/facecalendar

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/login_controller.rb
	app/views/calendar/show.html.erb
	app/views/layouts/application.html.erb
	app/views/login/start.html.erb
	config/database.yml
	config/routes.rb