Merge pull request #11 from BrianDBuchanan/brian

transportation.js updates
committing again
Merge pull request #12 from MikeESL/myFunctioneers

committing again
I returned to what I was doing in class. But I think, roughly, the commented out parts at the beginning of restaurants.js might be needed, and i left those change in index.html
updated fonts
Merge pull request #13 from TIY-Q2-FEE-CHS/devBranch

updated fonts
Constructors in One Doc
Merge pull request #14 from berjoyner/BerBranch

Constructors in One Doc  OKay!! SUper great!!!!!!!
Dom jQuery for HTML
Activity
pre-pull commit
Merge pull request #15 from berjoyner/BerBranch

Ber branch
'commit'Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/4Functioneers into myFunctioneers

Conflicts:
	app/scripts/main.js
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/4Functioneers into myFunctioneers
For Mike
Merge pull request #16 from berjoyner/BerBranch

For Mikeok
Included underscore, started team bios
I dont know
Merge pull request #17 from TIY-Q2-FEE-CHS/devBranch

Included underscore, started team bios
test commit
Merge pull request #18 from MikeESL/myFunctioneers

My functioneers- trying!