Merge pull request #3 from ahardy55/re-fork

all files from previous fork
Added Contributors to README
add contributing.md file
Merge pull request #5 from krauzer/basic_updates

Basic updates to ReadMe and Addition of Contributing File
Merge pull request #6 from ahardy55/users

App Restructured
Merge pull request #7 from ahardy55/models

Add workout history and exercise migrations
Create history models
Add model associations based on addition of new tables/models
Add weight, reps, rest_time to schema.rb
Write Rspec tests for user model validations
Write Rspec tests for exercise and workout validations
Add seed file
Add exercise csv
Merge branch 'master' of https://github.com/red-spotted-newts-2014/strong-times

Conflicts:
	app/models/exercise.rb
	db/schema.rb
Merge pull request #8 from user1011/master

Add seeds for exercises
resolve merge conflicts in seed data