remove server.js~
Merge branch 'master' of https://github.com/oshribin/TangiPlan

Conflicts:
	server.js~
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan
Merge branch 'master' of https://github.com/oshribin/TangiPlan