all main views finished
.gitignore added, branches merged