Removed temporary gedit file
Added ignore entry for gedit temporary files
Merge branch 'master' of github.com:rjagerman/AT3

Conflicts:
	recipes/libtorrent/recipe.sh~
Merge branch 'master' of github.com:rjagerman/AT3

Conflicts:
	recipes/libtorrent/recipe.sh~