updated userschedule page to show options for ics programs
updating about
Merge branch 'master' of https://github.com/jennyallen/diybootcamp

Conflicts:
	mama.rb