Re-factoring and removing files
Merge branch 'master' of https://github.com/hebatuallah/tech

Conflicts:
	conskurra/app/models/user.rb