Merge branch 'hotfix/0.0.1_facebook_id_fix' into develop
Merge branch 'master' of https://github.com/RobertBentinck/PronounceThis into feature/database_redesign
remove node_modules from repo
mysql dependency
JS tidy and comments
add database connection pool
Facebook share fix, www 301 redirect(express)
Merge branch 'hotfix/0.0.2' into develop
implement call to database before requesting from dictionary.com
create insert function (call to function is commented out)
fixed and implement insert function
move database connection info to config file
feature toggle database
Merge branch 'master' into develop

ignored, and an empty message aborts
Merge branch 'feature/database_redesign' into develop

Conflicts:
	index.js
Merge branch 'release/0.1.0'