more server
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1

Conflicts:
	userApp/newuser.html
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1
updates
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1
start of database and file saving
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1

Conflicts:
	userApp/newuser.html
Merge branch 'master' of https://github.com/gsfyrakis/agile_challenge1