added info files
updated gitignore file
Merge branch 'welcome' of github.com:monzoor-nc/vikings

Conflicts:
	index.html
	js/user/user.js
	sass/screen.scss
	stylesheets/screen.css
deleted wrong file