Molly - deleting kiln and manual, adding more in the about us secition
Merge branch 'master' of https://github.com/mebartle/octoberFourth2014
Molly - adding rsvp options
Molly - merging about us
Conflicts:
	views/about-us.erb