modified infobox
fixed merge with css file
Merge branch 'master' of https://github.com/cameron-erdogan/CLAM-Final-Project
Merge branch 'master' of https://github.com/cameron-erdogan/CLAM-Final-Project