removed swap file
removed swap files
Added gitignore
Merge branch 'devel'

Conflicts:
	ofa-tasks.rb