profiles updated, information box now on right side
Merge branch 'master' of https://github.com/CS169-badjr/calapps
Merge branch 'master' of https://github.com/CS169-badjr/calapps into ProfilePages
Merge branch 'ProfilePages'