added string "test"
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	main/src/main/java/com/samdide/android/clockwidget/MainActivity.java
Merge branch 'master' of https://github.com/HenrikSamuelsson/ClockWidget
new code, many changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_0_1.xml
	main/src/main/java/com/samdide/android/clockwidget/MyWidgetProvider.java
	main/src/main/res/xml/widget_info.xml