gitignore
Manual merge

"Manually" merged all the content I was working on, along with editing
the .gitignore, so that the files to be ignored, can truly be ignored.
Ignore: No change
Ignore: no change
Merge branch 'master' into MattMoveImage
Minor changes at tafe

	modified:   PAWA/Classes/AlbumGrid.cs
	modified:   PAWA/Views/Admin/TagManagement.cshtml
Made slight change to AlbumGrid
the return of valid IEnumerable after try catch had occured on the query string.
Was previously recieving errors where the error message was vague.

	modified:   ../.gitignore
	new file:   .gitignore
	modified:   Classes/AlbumGrid.cs
	new file:   PAWA.sln
	new file:   README
	modified:   Scripts/GridOptionHandle.js
Merge branch 'MattMoveImage' of https://github.com/jarradm/PAWA into MattMoveImage

Conflicts:
	PAWA/Classes/AlbumGrid.cs
Merge branch 'DeleteImage' into MattMoveImage

Conflicts:
	PAWA/Classes/AlbumGrid.cs
	PAWA/Views/Home/Album.cshtml
remove # test from README
added git .ignore file
Merge branch 'master' of https://github.com/jarradm/PAWA
First Commit
Fixing unlinked files

The java script file and the create folder view were not linked into the
project for some reason, now they are.
Fixing unlinked files

The java script file and the create folder view were not linked into the
project for some reason, now they are.
Merge branch 'SamsBranch' of https://github.com/jarradm/PAWA into SamsBranch

Conflicts:
	PAWA/Views/Home/CreateFolder.cshtml
Merge branch 'master' of https://github.com/jarradm/PAWA into MattMoveImage

Conflicts:
	PAWA/App_Themes/SiteLayout_Header.css
	PAWA/Classes/AlbumGrid.cs
	PAWA/Views/Home/Album.cshtml
general update
Commit half finished

Get the work uploaded before TAFE
Commit half finished

Get the work uploaded before TAFE