Merge branch 'master' into travis-ci
fixed a space
getting closer
added export to encrypted lines
Merge branch 'master' into travis-ci
looping and video functionality broken :/
fixed video looping, inspect logic for last video switch
no real change, content size error still stopping loop
-v
updating branch, loop working with new master content
moving travis and dotgpg into test/dev area of gemfile
removing videos to try switch to aws s3
adding back in mp4 files
Merge branch 'master' into landing_page_redesign
Merge pull request #79 from whoisglover/landing_page_redesign

Landing page redesign
removing travis-ci
Merge branch 'master' into travis-ci

Conflicts:
	Gemfile
Merge pull request #81 from whoisglover/travis-ci

Removing Travis ci
Integrated Submissions Pie Chart into Student Overview

Using HighCharts via the lazy_high_charts gem. Chart is created in the user_controller and displayed in the users/show.html.erb view.
changed color scheme