Working, but im confused as to what it should look like for concepts
Merge branch 'master' of https://github.com/ConnorTech/Scientific-Method

Conflicts:
Scientific Method/Scientific
Method/en.lproj/MainStoryboard_iPhone.storyboard
confilct
fixed?