analyt
getting analytics to work
working on file upload
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/index.html
	app/scripts/directives.js
nothing really
commit for branch
image upload working
Merge branch 'upload'

Conflicts:
	app/scripts/controllers.js
login redo (just on homepage)
Fixed skroll creation and skroll list.
Merge branch 'as11712-master' into bigmerge

Conflicts:
	app/scripts/controllers.js
	app/scripts/directives.js