initial commit
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Med-Flow

Conflicts:
	config/environment.rb
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	db/development.sqlite3
	log/development.log
	log/test.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
implemented voting
Merge pull request #30 from alextle0125/master

voting