wat?
Amazon Version
Merge branch 'master' of git@github.com:wststreet2/LcdLiveWallpaper.git

Conflicts:
	LiveWallpaper/src/org/kamehamehaaa/android/livewallpaper/settings/LCDLiveWallpaperSettings.java