deleted more vim files
Merge branch 'master' of https://github.com/twuster/rails-final-project
Merge pull request #3 from twuster/welcome_page

Welcome page
fixed pg and minor changes
Merge branch 'master' of https://github.com/twuster/rails-final-project
Added latitude and longitude to boards
pins
Merge https://github.com/twuster/rails-final-project

Conflicts:
	db/schema.rb
commiting DS_STORE
delete DS store
launch and flash
Merge pull request #4 from twuster/kevin/launch-and-flash

launch and flash
fixing schema
sign up and sign in pages
rename
fix merge conflicts