changing name claira_function
Merge branch 'develop' of github.com:Xanadhi/time_capsule into develop
websocket sinatra added
added working websocket
added working cross-site connections
playing with claira bot does not work
Merge branch 'feature/websocket2' into develop
Merge branch 'develop' of github.com:Xanadhi/time_capsule into develop

Conflicts:
	Gemfile.lock
	app/actions.rb