Changed password
Updated gitignore
Merge branch 'master' of github.com:jamietotten/CFSunalta

Conflicts:
	.gitignore
	prototype/source/index.html.erb
removed config.php