Merge branch 'develop' of github.com:iu1nguoi/sit into twerking-frontend
Added the bookmarklet to the startpage
Merge branch 'master' into develop
running sandbox evernote for development
Changed to local SSL Store
Revert "Changed to local SSL Store"
Set Debug Mode to no SSL Check
This reverts commit 3946eeb8be006033fc4ea00996ac499323eff4a0.
finish frontend
Add Library to get the nearness of two arrays.
Merge remote-tracking branch 'origin/twerking-frontend' into develop
Missed GemFile
Merge branch 'develop' into feature/fixup
remove /home
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into feature/fixup

Conflicts:
	app/views/pages/home.html.erb
Some more changes for word compare
Small change
Added more information to rate limiting
Some changes on the word compare part
flash
login to evernote
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/pages_controller.rb