welcomePage.html, included list of installed software
added vim swap files to gitignore
idk
Merge branch 'master' of https://github.com/kerko/sysadm-project