修复默认周视图，左右滑动的bug，更新效果图

.gitignore

@@ -1,82 +1,32 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-=======
+# 通用的忽略文件设置（http://stackoverflow.com/questions/16736856/what-should-be-in-my-gitignore-for-an-android-studio-project）
 # built application files
 *.apk
 *.ap_
 
 # files for the dex VM
-=======
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
->>>>>>> 255ce4d0ca8cb280ecbcbc98cebfb5a403c5d6a6
 *.dex
 
-# Java class files
-*.class
-
-<<<<<<< HEAD
 # generated files
 bin/
 gen/
-=======
-# Generated files
-bin/
-gen/
-out/
 
-# Gradle files
+# Ignore gradle files
 .gradle/
 build/
->>>>>>> 255ce4d0ca8cb280ecbcbc98cebfb5a403c5d6a6
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-<<<<<<< HEAD
-# Eclipse project files
-.classpath
-.project
+# Mac OS X clutter
+*.DS_Store
 
-# Proguard folder generated by Eclipse
-proguard/
-
-# Intellij project files
+# Android Studio
 *.iml
-*.ipr
-*.iws
-.idea/
-
->>>>>>> 75df40ca931fef7d4a370a7eb7bb028e95554ad1
-=======
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
 
-# Intellij
-*.iml
-.idea/workspace.xml
+# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
+/.idea/workspace.xml
+/.idea/libraries
 
-# Keystore files
-*.jks
->>>>>>> 255ce4d0ca8cb280ecbcbc98cebfb5a403c5d6a6
+# other setting
+/captures
+*.keystore