add cybercoach integration doc
Update Readme.md

Added "git merge feature/xyz --no-ff".
Update README.md
Merge branch 'origin/dev'
Update README.md
This is tested and should be working.
create user on cyber coach
Added design mockup for all views (except forms).

Closes #8.
solve cybercoach user deletion
Merge remote-tracking branch 'origin/users_cybercoach_new' into dev

Conflicts:
	Gemfile
Merge branch 'dev' of github.com:ASE-2014/spoodle into dev
Improvements and stuff
Merge branch 'origin/dev'
Merge branch 'origin/master'
Fixed little bug in event controller.
Forgot to delete an unneeded line of code.
Merge branch 'dev' into refactoring/rest

Conflicts:
	app/views/events/index.html.erb
Fixed some stuff I destroyed while merging (commit #ab080c6 ) - mainly
permitting post params.
Merge branch 'dev' into refactoring/rest
Moved user creation and destruction out of User into CybercoachUser and
CybercoachResources. Need to generalize creation though.