Added bootstrap folders
Merge branch 'master' of github.com:lilykuang/Fall14HKSA

Conflicts:
	log/development.log
	tmp/pids/server.pid

	new file:   app/assets/stylesheets/front_pages.css.scss
	new file:   app/controllers/front_pages_controller.rb
	modified:   app/controllers/users_controller.rb
	new file:   app/helpers/front_pages_helper.rb
	modified:   app/helpers/sessions_helper.rb
	new file:   app/views/front_pages/index.html.erb
	new file:   app/views/users/index.html.erb
	modified:   config/routes.rb
	modified:   db/development.sqlite3
	new file:   db/migrate/20140822074730_add_admin_to_users.rb
	modified:   db/schema.rb
	modified:   log/development.log
	new file:   test/controllers/front_pages_controller_test.rb
	new file:   test/helpers/front_pages_helper_test.rb
	modified:   tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	new file:   tmp/cache/assets/development/sprockets/8be6f396e6f793b6ea6c2e791c4ff44a
	new file:   tmp/cache/assets/development/sprockets/b4e1c3cc1f67b182f4e4e2b8a053b5ce
	modified:   tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	new file:   tmp/cache/assets/development/sprockets/d09bbe70c0bb69e23a052db2cdbbeddc
	modified:   tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	new file:   tmp/pids/server.pid
Tried to make a gitignore file