Removed useless crap, replaced tabs by spaces
Merge branch 'master' of https://github.com/spaceconcordia/space-netman