Merge branch 'develop'
Merge branch 'develop' of https://github.com/jamesus95/ucf_website into develop

# By unknown
# Via unknown
* 'develop' of https://github.com/jamesus95/ucf_website:
  added css/js
Merge branch 'master' of https://github.com/jamesus95/ucf_website into develop

# Via unknown
* 'master' of https://github.com/jamesus95/ucf_website: