commiting these changes so github will let me pull from master.
committing the merged files
polished off app style