asdf2
fixed merge

merge branch 'master' of https://github.com/atang930606/UBC-Course-Alert

Conflicts:
	Cycler.java
finished