add index action to pages controller and create index view
switch api and api_calls, allow people to be created
fix merge conflicts
go forth
Merge branch 'master' of https://github.com/dereksilverman/Future.me

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/dereksilverman/Future.me

Conflicts:
	.gitignore