Level 7 storyboard looks good. Coding part is still untouched.
Copying over template files from Level10
Working on level 12 - adding HTTP and HTTPS screens
Fixed merge conflicts
Working level 12
Trying to merge all of Level12 into one view controller
Pulling main storyboard
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S3_Team1 into Level12
Finishing level 12
Fixed merge conflicts
Adding package for 12
Merged in Level12 changes
Added the code, now need to get segues working
Changed the level completion text.
Merge remote-tracking branch 'origin/master' into Level7
Working on level 11
Changed a few things, all segues good, but button image doesn't load properly.
Working on password view controller for level 11
Fixing main storyboard
Fixed the problem, now to make tests.