updated index, added two images, update css
Merge branch 'master' of https://github.com/theodi/colleen

Conflicts:
	web/css/default.css
	web/index.html
Update mysql_notes.txt
Update mysql_notes.txt
Update README.md
Update README.md
Added The Space Google analytics to index.html
Merged GA code so function not duplicated. Created new tracker for The Space
Update .gitignore

don't want to commit .log files.
Updated GA code in index.html
Update sequelpro_notes.txt
Update README.md
Update mysql_notes.txt
merge client-dev

Conflicts:
	.gitignore
	README.md
	client/css/app.css
	client/data/project_rules.json
	client/js/app.js
	client/js/canvas_renderer.js
	web/index.html
Add projects.json
merge client-dev

Conflicts:
	client/data/project_rules.json
	client/js/app.js
	web/css/layout.css
	web/index.html
Add index.html
Add patina_test.jpg