Merge pull request #1 from AlexisDeReyes/master

website as it is now
Merge pull request #2 from AlexisDeReyes/master

Adding models.js
setting up the views
Merge branch 'master' of https://github.com/harterc3/SpeakEZ

Conflicts:
	node_modules/indexof/package.json
	server.js
merge
Merge pull request #3 from julespatry/master

UI Views/ public folder
fixed view problem
Merge pull request #4 from julespatry/master

fixed view problem