Initial Import
Changed to master branch of haml-rails

--amend

Added controllers to replace the ones from InheritedResources

work

Work on Rails4 udpate

Added Factory Girl Rails

Installed spork.

Fixed palaces controller.

Fixes for friendly_id

Check Point

Completed migration to rails 4.
Merge branch 'release/release_1'
Changed to master branch of haml-rails

--amend

Added controllers to replace the ones from InheritedResources

work

Work on Rails4 udpate

Added Factory Girl Rails

Installed spork.

Fixed palaces controller.

Fixes for friendly_id

Check Point

Completed migration to rails 4.

B;ahblah

Switched to responsive stylesheets

- Eliminated most existing styles.
- Switched to the mainstream twitter-bootstrap-rails
Added redis build to environment
Did stuff
Added search bar in main nav
Added image.
Added animal images.
Updates
remove container element
Things lookin' pretty reasonable.
Awesome
Pretty good.
Chart looks good for now.
Layout changes to the charts index page
Removed a gem to fix an error.
Regression error from the Rails upgrade.
Minor fixes.
Merge branch 'release/v1.1.beta'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/.DS_Store
	app/assets/images/da_yuan_circle.png
	app/assets/javascripts/application.js
	app/assets/javascripts/bootstrap/bootstrap-timepicker.min.js
	app/assets/javascripts/people.js.coffee
	app/assets/stylesheets/application.css
	app/controllers/branches_controller.rb
	app/controllers/comments_controller.rb
	app/controllers/people_controller.rb
	app/controllers/search_controller.rb
	app/helpers/palaces_helper.rb
	app/models/ability.rb
	app/models/branch.rb
	app/models/chart.rb
	app/models/chart_builder.rb
	app/models/chart_palace.rb
	app/models/chart_palace_list.rb
	app/models/chart_pdf.rb
	app/models/element.rb
	app/models/lunar_year.rb
	app/models/palace.rb
	app/models/person.rb
	app/models/pillar.rb
	app/models/star.rb
	app/models/stem.rb
	app/views/chart_palaces/_chart_palace.html.haml
	app/views/charts/_chart_palace.html.haml
	app/views/comments/_comments_list.html.haml
	app/views/comments/_form.html.haml
	app/views/layouts/application.html.haml
	app/views/palaces/show.html.haml
	app/views/people/_form.html.haml
	app/views/people/index.html.haml
	app/views/people/new.html.haml
	app/views/people/show.html.haml
	app/views/stars/_star.html.haml
	app/views/stars/show.html.haml
	db/schema.rb
	lib/extensions/bs_friendly_id.rb
	lib/tasks/test_lib.rake
	test/lib/bs_friendly_id_test.rb
	test/test_helper.rb