Update Project Setup
Update Project setup
Update Project Setup
Delete .DS_Store
Delete .DS_Store
Add next_irrigation
Add next_irrigation
Merge branch 'aira_0'

Conflicts:
	aira/irma_model.py
	aira/views.py
	aira_project/templates/aira/next_irrigation.html
Update irma_model.py
Remove .DS_Store
Update next_irrigation