Pis R fil
Knap i PictoAdmin som sender tomme objekter implementeret
Merge remote-tracking branch 'origin/master' into Anders
Merge remote-tracking branch 'origin/master' into Anders

Conflicts:
	Source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/pictoadmin/R.java
	Source/workspace/PictoAdmin/res/layout/activity_picto_admin_main.xml
	Source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
oh  shit
oh balls