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
Merge branch 'master' into travis-ci

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

Removing Travis ci
changed color scheme
video now stays the size of the screen. YAY
Merge branch 'master' into homepage_styling
Merge pull request #82 from whoisglover/rubric_branch

Rubric new, edit, show
Merge branch 'master' into style_rubric
styled the ecreate/edit rubric page
Merge pull request #83 from whoisglover/homepage_styling

Homepage styling
Merge pull request #84 from whoisglover/student_overview_charts

Student overview charts
Merge pull request #85 from whoisglover/style_rubric

Style rubric