Initial commit
Finished Merge
Merge branch 'master' of https://github.com/gasparfm/linuxmon

Conflicts:
	README.md