Evernote back-end in Ruby
Merge branch 'master' of https://github.com/EnaMai/CS376

Conflicts:
	script.js

Fixing