Filled out plist
Merge remote-tracking branch 'origin/master'
Added new plist