annotations test
Merge branch 'annotations'

Conflicts:
	app/src/main/java/com/osacky/hipsterviz/PlaceholderFragment.java
	app/src/main/java/com/osacky/hipsterviz/TrackListAdapter.java
code fixes