#7 Contact page
Merge branch 'master' of https://github.com/minhuyen/portfolio

Conflicts:
	wsgi/settings.py
	wsgi/urls.py
Merge branch 'master' of https://github.com/minhuyen/portfolio
Merge branch 'master' of https://github.com/minhuyen/portfolio
Merge branch 'master' of https://github.com/minhuyen/portfolio
Merge branch 'master' of https://github.com/minhuyen/portfolio

Conflicts:
	wsgi/settings.py