Changed usepackage to requirepackage and color to xcolor
Merge branch 'master' of github.com:dragly/uiofysmaster