name change
bootstrap
progress-page
kevin's branch
added framework html and css for friend search on challenges
added gitignore
initial content commit
initial commit
made the icons larger and added top padding
change to uppercase title
added autocomplete to search box
Create HomePage
Update and rename HomePage to homepage.html
Create homepage.css
add gitignore
Merge branch 'master' of github.com:motivate/motivate
Merge branch 'britt'

Conflicts:
	.gitignore
Merge branch 'elaine'
Merge branch 'ted'

Conflicts:
	css/bootstrap.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
added some button functionality