Merge branch 'master' of github.com:TomGroombridge/book_project

Conflicts:
	app/models/user.rb
	db/schema.rb
updating twitter profile
changes
api
changes