added magnific-popup, bower updated
Revert "new tax for Media, more template work"

This reverts commit 56609f1a59c7f107f15089d10923c438e0ff06e1.
Revert "Revert "new tax for Media, more template work""

This reverts commit 82cca6dfda35660a6a59d08848a59f3018f6a6c4.
Revert "added magnific-popup, bower updated"

This reverts commit 4c907646c60e5c39fe11667be43fe5cab988ed34.
Merge branch 'master' of github.com:UWAA/uwaa-2014