edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	models/mysql.js
	public/stylesheets/homestyle.css
	public/stylesheets/loginstyle.css
	views/home.ejs
	views/login.ejs