Ignore *.html,*.txt,*.bak,*.Rproj
Merge branch 'master' of github.com:ialyabiev/ExData_Plotting1

Conflicts:
	.gitignore
local del