Adding missing files from previous commit
Updating
Adding file
Updating
Module ASHRAE fonctionnel
Fin de journée
Saving progress
Updating
Merge branch 'AddingASHRAE62-1Module'

Conflicts:
	db/schema.rb
Updating with schedules