Merge branch 'master' of https://github.com/codefellows/sea-b27-python
adjusted Vagrantfile
Merge branch 'master' of https://github.com/codefellows/sea-b27-python
Merge remote-tracking branch 'upstream/master'

Conflicts:
	LectureSupplements/Sql/Vagrantfile
fixed vagrant file
fixed vagrantfile
edited files
Merge branch 'master' of https://github.com/codefellows/sea-b27-python
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/codefellows/sea-b27-python
Merge branch 'master' of https://github.com/codefellows/sea-b27-python
Flask code demo
Merge branch 'master' of https://github.com/codefellows/sea-b27-python
added 2nd time slot
Signs up for talk on Thursday about FISH
Merge pull request #5 from CharlesGust/master

add Charles Gust to Wed Oct 22
Merge pull request #6 from miracode/master

2nd Time Slot Request
Merge branch 'flashtalk-signup' of https://github.com/jbbrokaw/sea-b27-python into jbbrokaw-flashtalk-signup

Conflicts:
	LightningTalks/schedule.md
Merge branch 'jbbrokaw-flashtalk-signup'
Adding my name