first commit
rails app added
gemfile and database added
wheel controller and model added
sections added
question controller and model added
corrected question table
answers added
user model (devise) added
alternative database approach
question and section model removed
questions / sections model removed
questions removed
tests fixed
tests updated
update tests
added static pages
added static pages
gitignore
Merge branch 'master' of https://github.com/mvandeloo/360life

Conflicts:
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid