finally fixed gitignore - Im dumb
final git ignore update
Merge branch 'testing'
Merge branch 'master' of https://github.com/jhuntdog/cprkc-study-pages

Conflicts:
	.gitignore