Update
Update
template user, skroll
Merge pull request #14 from ne0n666/master

user and skroll template
Update
Merge branch 'controllers' of https://github.com/as11712/Skrolls into as11712-controllers

Conflicts:
	app/views/skroll.html
	app/views/user.html
Merge branch 'master' of https://github.com/as11712/Skrolls into as11712-master

Conflicts:
	app/data/skrolls/skrolls.json
	app/index.html
	app/scripts/app.js
	app/views/skroll.html
	app/views/skrolls-list.html
	app/views/user.html
routing fix
fixes
Merge pull request #17 from ne0n666/master

routing fixed
Merge branch 'master' of https://github.com/as11712/Skrolls into as11712-master

Conflicts:
	app/index.html
Merge branch 'as11712-master'

Conflicts:
	app/scripts/controllers.js
	app/scripts/services.js
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls
Update bower.json
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls
Fixed controller, services...