Merge pull request #19 from as11712/master

Fixed controllers, services,...
things
stuff
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/scripts/controllers.js
	app/scripts/services.js
debugging
	for heroku
for heroku2
heroku 3
heroku 4 ffs
herokuuuuu
hero
fixing urls for heroku
heroku final (hopefully)
urls back to normal
url finally working
Merge pull request #20 from ne0n666/master

heroku and URLs working
Update from main