make path absolute
remove a session file and add to ignore
Sublime updates?
Merge the two branches
Merge remote-tracking branch 'origin/master'
seems it didnt happen the first time

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'