removing
s
a
d
q
tutorials route
app
now
Merge branch 'master' of https://github.com/bojankolosnjaji/SEBA_Fitnex

Conflicts:
	SEBA_FitNex/app/controllers/Application.java
	SEBA_FitNex/app/controllers/TutorialController.java
	SEBA_FitNex/app/models/Address.java
	SEBA_FitNex/app/models/User.java
	SEBA_FitNex/app/views/Application/tutorial.html
	SEBA_FitNex/eclipse/classes/.gitignore