Loaded bootstrap.  Made partials for the Header.  Started frontpage
Removed tmp and log directory from repo
Merge branch 'master' of github.com:lilykuang/Fall14HKSA

Conflicts:
	app/views/front_pages/index.html.erb
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid

	modified:   .gitignore
	new file:   app/assets/javascripts/members.js.coffee
	new file:   app/assets/stylesheets/members.css.scss
	new file:   app/assets/stylesheets/navbar.css
	modified:   app/controllers/front_pages_controller.rb
	new file:   app/controllers/members_controller.rb
	new file:   app/helpers/members_helper.rb
	modified:   app/models/front_page.rb
	new file:   app/models/member.rb
	modified:   app/views/front_pages/index.html.erb
	new file:   app/views/members/new.html.erb
	new file:   app/views/shared/_header.html.erb
	modified:   config/routes.rb
	modified:   db/development.sqlite3
	new file:   db/migrate/20140823211632_fix_fist_name.rb
	modified:   db/schema.rb
	new file:   public/assets/application-1f10720363c019350ce8205f4156ce74.js
	new file:   public/assets/application-1f10720363c019350ce8205f4156ce74.js.gz
	new file:   public/assets/application-cc226c784312e4cef9c84dbf9861587e.css
	new file:   public/assets/application-cc226c784312e4cef9c84dbf9861587e.css.gz
	new file:   public/assets/glyphicons-halflings-regular-04097583f3394813b9642cf91c9e019f.ttf
	new file:   public/assets/glyphicons-halflings-regular-096f18b081b104fd70a613a5a85c3a6b.eot
	new file:   public/assets/glyphicons-halflings-regular-dd55935477ecf169e4d77cfcd00964d7.svg
	new file:   public/assets/glyphicons-halflings-regular-f32c7c112d6ae9aafd723c78dfe35bcf.woff
	new file:   public/assets/manifest-54548739c02959956d2d5af1d03c3015.json
	new file:   test/controllers/members_controller_test.rb
	new file:   test/helpers/members_helper_test.rb
	new file:   test/models/member_test.rb
	new file:   vendor/assets/javascripts/bootstrap.js
	new file:   vendor/assets/javascripts/bootstrap.min.js
	new file:   vendor/assets/stylesheets/bootstrap.css
	new file:   vendor/assets/stylesheets/bootstrap.min.css