ignore log files
update gitignore
Merge branch 'master' of https://github.com/cb597/alma_prog2

Conflicts:
	.gitignore