Spec and Features added
Merge branch 'cucumber'

Conflicts:
	Gemfile
	Gemfile.lock
Changed make year to date
Converted make year to date in view