company page
homepage modifications
update company
changes
merge successful
minor change
merge with bencopy
full working version
cleanup complaint inbox
Merge branch 'master' of https://github.com/sirantho20/voiceout

Conflicts:
	vendor/bin/markdown
	vendor/cebe/markdown
	vendor/kartik-v/bootstrap-fileinput
	vendor/kartik-v/bootstrap-fileinput/CHANGE.md
	vendor/kartik-v/bootstrap-fileinput/README.md
	vendor/kartik-v/bootstrap-fileinput/bower.json
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.css
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.min.css
	vendor/kartik-v/bootstrap-fileinput/examples/index.html
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.js
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.min.js
	vendor/kartik-v/bootstrap-star-rating
	vendor/kartik-v/bootstrap-star-rating/README.md
	vendor/kartik-v/dependent-dropdown
	vendor/kartik-v/yii2-field-range
	vendor/kartik-v/yii2-widgets
	vendor/kartik-v/yii2-widgets/CHANGE.md
	vendor/kartik-v/yii2-widgets/README.md
	vendor/kartik-v/yii2-widgets/assets/css/growl.css
	vendor/kartik-v/yii2-widgets/assets/css/growl.min.css
	vendor/kartik-v/yii2-widgets/assets/js/bootstrap-growl.js
	vendor/kartik-v/yii2-widgets/assets/js/bootstrap-growl.min.js
	vendor/kartik-v/yii2-widgets/lib/select2/select2-bootstrap3.css
	vendor/kartik-v/yii2-widgets/lib/select2/select2-bootstrap3.min.css
	vendor/kartik-v/yii2-widgets/widgets/Growl.php
	vendor/kartik-v/yii2-widgets/widgets/GrowlAsset.php
	vendor/kartik-v/yii2-widgets/widgets/Select2.php
	vendor/phpspec/php-diff
	vendor/swiftmailer/swiftmailer
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
	vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
	vendor/yiisoft/jquery-pjax
	vendor/yiisoft/yii2-bootstrap
	vendor/yiisoft/yii2-bootstrap/ActiveField.php
	vendor/yiisoft/yii2-bootstrap/ActiveForm.php
	vendor/yiisoft/yii2-bootstrap/Alert.php
	vendor/yiisoft/yii2-bootstrap/Button.php
	vendor/yiisoft/yii2-bootstrap/ButtonDropdown.php
	vendor/yiisoft/yii2-bootstrap/ButtonGroup.php
	vendor/yiisoft/yii2-bootstrap/CHANGELOG.md
	vendor/yiisoft/yii2-bootstrap/Carousel.php
	vendor/yiisoft/yii2-bootstrap/Collapse.php
	vendor/yiisoft/yii2-bootstrap/Dropdown.php
	vendor/yiisoft/yii2-bootstrap/Modal.php
	vendor/yiisoft/yii2-bootstrap/Nav.php
	vendor/yiisoft/yii2-bootstrap/NavBar.php
	vendor/yiisoft/yii2-bootstrap/Progress.php
	vendor/yiisoft/yii2-bootstrap/Tabs.php
	vendor/yiisoft/yii2-bootstrap/Widget.php
	vendor/yiisoft/yii2-codeception
	vendor/yiisoft/yii2-codeception/BasePage.php
	vendor/yiisoft/yii2-codeception/TestCase.php
	vendor/yiisoft/yii2-composer
	vendor/yiisoft/yii2-composer/Installer.php
	vendor/yiisoft/yii2-debug
	vendor/yiisoft/yii2-debug/LogTarget.php
	vendor/yiisoft/yii2-debug/Module.php
	vendor/yiisoft/yii2-debug/Panel.php
	vendor/yiisoft/yii2-debug/components/search/Filter.php
	vendor/yiisoft/yii2-debug/components/search/matchers/Base.php
	vendor/yiisoft/yii2-debug/components/search/matchers/SameAs.php
	vendor/yiisoft/yii2-debug/controllers/DefaultController.php
	vendor/yiisoft/yii2-debug/models/search/Db.php
	vendor/yiisoft/yii2-debug/models/search/Debug.php
	vendor/yiisoft/yii2-debug/models/search/Log.php
	vendor/yiisoft/yii2-debug/models/search/Mail.php
	vendor/yiisoft/yii2-debug/models/search/Profile.php
	vendor/yiisoft/yii2-debug/panels/DbPanel.php
	vendor/yiisoft/yii2-debug/panels/LogPanel.php
	vendor/yiisoft/yii2-debug/panels/MailPanel.php
	vendor/yiisoft/yii2-debug/panels/ProfilingPanel.php
	vendor/yiisoft/yii2-gii
	vendor/yiisoft/yii2-gii/CHANGELOG.md
	vendor/yiisoft/yii2-gii/CodeFile.php
	vendor/yiisoft/yii2-gii/Generator.php
	vendor/yiisoft/yii2-gii/components/ActiveField.php
	vendor/yiisoft/yii2-gii/controllers/DefaultController.php
	vendor/yiisoft/yii2-gii/generators/controller/Generator.php
	vendor/yiisoft/yii2-gii/generators/crud/Generator.php
	vendor/yiisoft/yii2-gii/generators/crud/default/views/_form.php
	vendor/yiisoft/yii2-gii/generators/extension/Generator.php
	vendor/yiisoft/yii2-gii/generators/extension/default/AutoloadExample.php
	vendor/yiisoft/yii2-gii/generators/form/Generator.php
	vendor/yiisoft/yii2-gii/generators/model/Generator.php
	vendor/yiisoft/yii2-gii/generators/module/Generator.php
	vendor/yiisoft/yii2-swiftmailer
	vendor/yiisoft/yii2-swiftmailer/Mailer.php
	vendor/yiisoft/yii2-swiftmailer/Message.php
force commit
merge complete:
changes