no message
Merge branch 'change_reservation_according_to_date_on_calendar' into merge_master

Conflicts:
	.gitignore
Merge pull request #1 from jemson/merge_master

Merge master
git ignore
title
Merge branch 'change_reservation_according_to_date_on_calendar'
main css
Merge branch 'master' into gh-pages
main css
log in implementation
login css
no message
Merge remote-tracking branch 'origin/add_another_course_on_the_dashboard_schedule_region' into implementing_login

Conflicts:
	public/scripts/entities/user.js
	public/scripts/modules/login/show/show_controller.js
	public/scripts/modules/schedule/list/list_view.js
Merge branch 'implementing_login' into gh-pages

Conflicts:
	public/.sass-cache/d2ce11522c53790a81a38a2e36c8e38c5d584171/main.scssc
Merge branch 'gh-pages' into add_another_course_on_the_dashboard_schedule_region

Conflicts:
	public/.tmp/css/main.css