core update

Signed-off-by: Galen Lockwood <galenlockwood@gmail.com>
Merge branch 'master' of https://github.com/gklockwood/Drupalcon

Signed-off-by: Galen Lockwood <galenlockwood@gmail.com>

Conflicts:
	css/styles.css
	index.html
test

Signed-off-by: Galen Lockwood <galenlockwood@gmail.com>