new google cucumber tests
nothing special
Merge branch 'andy_iter3' of https://github.com/johngun3/Project_Steak into jeff_iter3

Conflicts:
	db/schema.rb
working calender: no tests
fixed uid bug in view
Omniauth test added