commit to pull new master
commit again to pull master
commit to pull
commit to pull
commit to pull
commit to pull
changed storyboard version number
commit to pull
.DS_store
fixing merge conflict, tool version
created the login screen and splash screen
small layout changes made. xcassettes made for images.
nothing changed here
added DS_Store to gitignore
fixing merge conflicts
commit to switch brach
adjusted splash screen
preparing to merge with master
fixing merge conflicts
fixed storyboard file issues.