Merge branch 'develop'

Changed folder structure, commented out angular ui carousel implementation in favor of custom impl., added routing boilerplate.

Next master update, fixed carousel implementation and styled, begin work on next page of site