basic layout
Merge branch 'master' of github.com:kpytang/agendafy

Conflicts:
	source/index.html.erb
update gitingore