Search
Merge branch 'master' of https://github.com/mig029/GeekTweet

Conflicts:
	start/src/main/java/com/migliori/start/geektweek/MainActivity.java

	start/src/main/java/com/migliori/start/geektweek/PlaceholderFragment.java
	start/src/main/java/com/migliori/start/geektweek/SearchFragment.java
	start/src/main/java/com/migliori/start/geektweek/TimeLineFragment.java
	start/src/main/res/layout/fragment_main.xml
	start/src/main/res/layout/fragment_search.xml
	start/src/main/res/layout/fragment_timeline.xml