refactored structure, init 2015
Merge branch 'master' of github.com:techparty/techparty

Conflicts:
	2014/index.html