Changes from bug 2 branch

Pushed to remote branch from local branch.
Changes made on master

Has a file shared with branch commit
Header change on the master

Header change on the master
Changes from bug 2 branch

Pushed to remote branch from local branch.
UI changes made by the branch

UI changes on the master
Removing empty methods and invalid comments.

Removing methods that were added by Xcode by default.
Merge branch 'master' into bug2

Conflicts:
	PushARepoToGitHub/AppDelegate.swift
	PushARepoToGitHub/ViewController.swift

Merging pull request for bug2 into master
Merge branch 'bug2'

Merging bug2 into master.