Merge branch 'master' of /Users/masonherhusky/IdeaProjects/FirstAndroidApp/BoilerMake2014Android with conflicts.
Added a next page button on homepage