working on web.js
working on web.js
Merge branch 'develop' of ssh://git@github.com/maciejsto/JSProject.git
into develop
web.js
web
Merge branch 'master' of heroku.com:jsproject into develop

Conflicts:
	web.js
Merge branch 'local'

Conflicts:
	web.js
Merge branch 'temp'

Conflicts:
	web.js
Merge branch 'master' into develop

Conflicts:
	web.js