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
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.
finished styling the student dashboard
Merge branch 'master' into css2
can now decrypt local file
Merge pull request #44 from whoisglover/css2

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

Landing page redesign
added styling to submission page
finished styling the student classroom view page