fixed conflict
solved conflick in gemlock
added secret key base
added models and deleted useless test files
Merge pull request #4 from SylvieC/add_models

Add model
created site controller
created real_charts controller
created ideal_charts controller
added activities controller
tidied up model associations
created seed file to finalize category names
Merge pull request #5 from missherico/controllers

Controllers