added database
made twitter login
Merge pull request #3 from gopher-snakes-2013/stop_info

User can see real time information about next departure for N Judah at Montgomery St. (outbound)
fixed merged conflicts
fixed .env file
added gitignore
removed .env
added small change
Merge pull request #5 from gopher-snakes-2013/env_file_removed

Env file removed
Merge conflicts resolved
* Map and timetable combined into one app

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app.rb
	views/layout.erb