model added
Merge branch 'master' of https://github.com/AaronPhiri/Data-Analyzer-new

Conflicts:
	db/schema.rb
not tracking temporary files