TEST
Merge branch 'master' of https://github.com/joshfermin/myCUplanner

Conflicts:
	README.rdoc
Changes the README.rdoc file