Merge branch 'release/0.4.0'. Includes all previous features (uploading a file, downloading a file, frames) and JQuery Menus
Added new pages for opening a new window in a separate tab
Added views for rendering a new window on click
Added more restrictive swp file ignore
Merge branch 'release/0.6.0'

Conflicts:
	server.rb
Deleted an end on accident - fixed