adding language parameters
Merge branch 'master' into travis-ci
Merge branch 'master' into travis-ci
start adding our build to travis.yml file
added rails environment variable to travis.yml
remove rails env
remove other crap
added travis gem to pass in environmental variables
work inprogress, html5 video is in
work in progress
working on travis-ci
Merge branch 'master' into travis-ci

Conflicts:
	Gemfile.lock
Submit/Save Functionality Working

Need to move logic from assignment/show view to assignment controller show method. Need to render completed essay title and content from assignment/_student_assignment_overview partial if essay has been submitted.
added dotgpg gem to travis to encrypt the .env file
Submissions displayed in correct assignment view

Displayed in editor or as plaintext depending on completion status. Moving logic to controllers.
can now decrypt local file
Landing page top section frame complete

The landing page now has a header, footer, and html5 video.  Buttons are in
place for login and sign up but still need modals/links.  Market pages are in place
with intelligent scrolling but no marketing content.
fixing stylesheet conflict, no real conflict
Merge pull request #44 from whoisglover/css2

finished styling for student dashboard
Merge pull request #46 from whoisglover/landing_page_redesign

Landing page redesign