change text on button
space the buttons
remove extra files
updated front page
remove temp file
fix conflicts