gitignore add
gitignore add
master fix
fix
Merge branch 'jonj'

Conflicts:
	.idea/workspace.xml
fix
Merge branch 'master' of github.com:Jon-J/SJProject_v1

Conflicts:
	.idea/workspace.xml
fix
fix