Merge pull request #3 from dannybutler/master

Small database change
Merge pull request #4 from dannybutler/master

Removing renamed files again
Adding a README
Rename profile_stats_3.py to stats_profiler.py
Rename profile_stats_config.json to stats_profiler_config.json
Update stats_profiler.py
Merge pull request #5 from dannybutler/master

Adding database server code
Merge branch 'master' of https://github.com/artsalliancemedia/cherry_pyformance

Conflicts:
	client/stats_profiler.py
Reverting changes
Merge pull request #6 from alexanderson/master

Adding Readme
Merge pull request #7 from dannybutler/master

Adding a README
Merge pull request #8 from dannybutler/master

Adding database changes
Merge pull request #9 from dannybutler/master

Adding gitignore file
merging some changes
Merge pull request #10 from alexanderson/fix-client

merging some changes