working on new index page
Merge branch 'master' of https://github.com/CS169-badjr/calapps
not useful
merge conflict 1
nothing important
Merge branch 'master' of https://github.com/CS169-badjr/calapps
Merge branch 'master' of https://github.com/CS169-badjr/calapps
welcome success button
Merge branch 'master' of https://github.com/CS169-badjr/calapps