index changes
Merge branch 'master' of https://github.com/rmulligan1/C4GARC

Conflicts:
	c4g/www/.DS_Store