Merge pull request #35 from danielbarela/master

updated resizing behavior for iphone 6 and 6 plus
Merge remote-tracking branch 'upstream/master'