Add chart test to file
Merge branch 'master' into venkman
make local database
Merge remote-tracking branch 'origin' into venkman
Merge branch 'master' into venkman
add savings line graph in chart4 area
format changes. ignore pulbic/uploads/ files
mimick barry's file structure, charts 2 & 4
Merge pull request #99 from blind-squirrel/Sharon

format changes. ignore pulbic/uploads/ files
Merge branch 'master' into venkman
Merge branch 'master' into barryn

Conflicts:
	bootstrap/start.php
Merge pull request #100 from blind-squirrel/venkman

Venkman
Merge branch 'master' into barryn