On branch master

 finished fomatting the code to my (Adam's) preferences

 Changes to be committed:
	modified:   server.R
	modified:   ui.R