Added autogenerated files to .gitignore
Removed newly ignored files
Fixed conflict in RakeFile
 Fixed conflicts in config/application.rb
Fixed conflicts in GemFile
Fixed conflicts in config/enviroment.rb
Fixed routes.rb .. Atleast I think I fixed it....
Fixed partial merge in development.rb
Fixed partial merges in production.rb
Resolved conflicts in appliaction.html.erb
Fixed Conflict in secret_token.rb
Removed duplicate Migrations
Merged the Kidzen and kidzen folders into kidzen
Merge branch 'development' into merging_the_two_kidzen_folders

Conflicts:
	kidzen/Gemfile
	kidzen/Gemfile.lock
	kidzen/config/initializers/secret_token.rb
	kidzen/config/routes.rb
	kidzen/db/schema.rb
Removed migrations from branch
Merge pull request #111 from yousraHazem/merging_the_two_kidzen_folders

Applying cleanup