Update 07-03-01-Password-Hashing.md
Update 05-05-01-Exceptions.md
Merge pull request #279 from kevinholler/gh-pages

Updated Engine Yard Resource link
Update translation links
Update 07-03-01-Password-Hashing.md
Merge pull request #277 from chriscct7/gh-pages

Finally Block and Change of Tense on Referring to Password_hash
Update message for broken translation links
Merge branch 'gh-pages' of github.com:codeguy/php-the-right-way into gh-pages
Add Jelastic PaaS
Merge commit '49215075a5b86d44db0bb7445f7dcf8357f37f9d' into gh-pages

Conflicts:
	_includes/welcome.md
Merge commit '7d31508cc78f9c2e18df6b3fde237712e3281bd9' into gh-pages

Conflicts:
	_includes/welcome.md
Merge commit 'b30e37edf7bc2fe0aca0a1524d8a65ea3064e593' into gh-pages

Conflicts:
	_posts/07-03-01-Password-Hashing.md
Merge commit '1e9ba1c7b4b98283fbe86fa080915b08d0e5afbe' into gh-pages