add angular ui and bootstrap
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/source/index.slim
changed the paths on the index file
Added ability to add events to the timeline
Removed the event JSON output from the event page
Adding of  users
moving the frontend and backend into the same folder
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	backend/myapp.rb
	backend/spec/requests/home_page_spec.rb
	frontend/karma.conf.coffee
fixing up merging
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/karma.conf.coffee
	frontend/source/index.slim
	frontend/spec/controllers/event_controller_spec.coffee
	frontend/spec/controllers/users_controller.spec.coffee
	frontend/spec/requests/patient_api_spec.rb
	frontend/spec/services/event_service_spec.coffee
removed some files that got through the merge