initiate repository
Added some stuff

Added static pages and locales
Added resources for routes
Coding controller
Merge branch 'master' of https://github.com/CS169-badjr/calapps

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	config/initializers/secret_token.rb
	config/routes.rb