added user tests. edited associations in user model
Merge remote-tracking branch 'origin/development' into user_story

Conflicts:
	app/models/user.rb
Merge pull request #13 from zahidkarim/user_story

added user tests. edited associations in user model