updated models and added seeds
Merge branch 'master' of https://github.com/daino3/nTouch into update_m_m

Conflicts:
	Gemfile.lock
deleted / modified reminder_reciepts model
Merge pull request #7 from daino3/update_m_m

Update m m