added devise User model and haml gem
devise signup, email and login working
generate the relationship model to act as a lookup between user and followers / following
Update model relationships
Merge branch 'zal_dev' into adam_dev

Conflicts:
	app/models/user.rb
Resolve conflicts on user.rb model