added files
removed cahed
git ignore added
Merge branch 'master' of github.com:monzoor-nc/vikings into store
Merge branch 'store' of github.com:monzoor-nc/vikings

Conflicts:
	js/user/user.js