Add more codecs and support for subtitles
Pulseaudio hasn't fucked me over yet
Add webcam support
Merge branch 'master' into Jdeapad

Conflicts:
	var/lib/portage/world
System updates
Merge branch 'master' into Jdeapad
Accept all keywords unless otherwise specified
Change some programs
Merge branch 'master' into Jdeapad
Add a batterywidget
add acpi for battery widget
Move nvidia around in the world file
Change a lot of stuff
Add oracle-jdk for android studio
Merge branch 'master' into Jdeapad