conkyrc - Conky positioned for a 1920*1080 screen
awesome theme.lua - Corrected background path
.README - Added section about dependencies
Merge branch 'master' of github.com:Rovanion/.files into 1080

Conflicts:
	.README
autostart.lua - Removed nm-applet for the desktop
Merge branch 'master' of github.com:Rovanion/.files into 1080

Conflicts:
	.config/awesome/autostart.lua
Merge branch 'master' of https://github.com/Rovanion/.files into 1080
Merge branch 'master' of github.com:Rovanion/.files into 1080
Merge branch 'master' of github.com:Rovanion/.files into 1080

Conflicts:
	.config/awesome/autostart.lua
Added fullscreen flash
Merge branch 'master' of github.com:Rovanion/.files into 1080
Merge branch 'master' into 1080
Merge branch '1080' of https://github.com/Rovanion/.files into 1080
Merge branch 'master' of https://github.com/Rovanion/.files into 1080
Made a script out of the README basically.
Added additional git setup and changed commit editor to terminal emacs.
Just restored the .conkyrc setting after merge.