pre-pull commit
'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
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!
committing to fix js errors
Merge pull request #19 from MikeESL/myFunctioneers

committing to fix js errors
fixed js errors
Merge pull request #20 from MikeESL/myFunctioneers

fixed js errors
templates for about page
Merge pull request #21 from TIY-Q2-FEE-CHS/devBranch

templates for about page
Navbar added
Merge pull request #22 from TIY-Q2-FEE-CHS/devBranch

Navbar added
commiting
Merge pull request #23 from MikeESL/myFunctioneers

commiting
Homepage styling fixes