Creating template
erge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
	package.json
	server.js
added index.html, package.json, server.js
package.json modified
package.json Modified 2
commit server.js and database.js²
database.js add capital A
blabla
database.js
signup.js
fsq:wq: Please enter the commit message for your changes. Lines starting
dfs
jerk me
hey
allelujah